Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 29 Mar 2007 15:33:32 +0000 (15:33 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 29 Mar 2007 15:33:32 +0000 (15:33 +0000)

Trivial merge